From: Mark Brown Date: Tue, 8 Nov 2011 01:17:30 +0000 (+0000) Subject: Merge branch 'for-3.2' into for-3.3 X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~11008^2~497 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb;p=linux-4.9.git Merge branch 'for-3.2' into for-3.3 Conflicts: sound/soc/codecs/wm8940.c --- 4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb